window: Handle manually bubbled events

The multipress gesture must react to either direct events on the
GtkWindow (special cased through _gtk_widget_check_handle_wm_event),
or bubbled events from child widgets. Ensure bubbled events go
through the gesture, those are fed manually to make sure events are
only handled once, in either one or other place. The implicit grab
will ensure that doesn't change mid-action.

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index bd0d0c26ce477e331339b209b7259ad2284de4f2..604fecef132ed598e2e4bd5724fb1c161a816337 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -403,6 +403,8 @@ static gboolean gtk_window_map_event      (GtkWidget         *widget,
                                            GdkEventAny       *event);
 static gint gtk_window_configure_event    (GtkWidget         *widget,
                                           GdkEventConfigure *event);
+static gboolean gtk_window_event          (GtkWidget         *widget,
+                                           GdkEvent          *event);
 static gint gtk_window_key_press_event    (GtkWidget         *widget,
                                           GdkEventKey       *event);
 static gint gtk_window_key_release_event  (GtkWidget         *widget,
@@ -685,6 +687,7 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->unrealize = gtk_window_unrealize;
   widget_class->size_allocate = gtk_window_size_allocate;
   widget_class->configure_event = gtk_window_configure_event;
+  widget_class->event = gtk_window_event;
   widget_class->key_press_event = gtk_window_key_press_event;
   widget_class->key_release_event = gtk_window_key_release_event;
   widget_class->focus_in_event = gtk_window_focus_in_event;
@@ -7910,6 +7913,16 @@ _gtk_window_check_handle_wm_event (GdkEvent *event)
   return gtk_window_handle_wm_event (GTK_WINDOW (widget), event);
 }
 
+static gboolean
+gtk_window_event (GtkWidget *widget,
+                  GdkEvent  *event)
+{
+  if (widget != gtk_get_event_widget (event))
+    return gtk_window_handle_wm_event (GTK_WINDOW (widget), event);
+
+  return GDK_EVENT_PROPAGATE;
+}
+
 static void
 gtk_window_real_activate_default (GtkWindow *window)
 {